369 allowing tests to be performed at individual locations not only location types #752

khoanguyen-dev · 2023-08-24T15:44:56Z

Changes and Information

Please briefly list the changes made, additional Information and what the Reviewer should look out for:

Remove Location from TestingCriteria
Use bitset for infectionState and unordered_set for AgeGroup instead of vector for TestingCriteria
Only one TestingCriteria per TestingScheme
Add map of LocationID to TestingScheme in TestingStrategy so run_strategy() will check Location and run only the corresponding schemes.

Merge Request - Guideline Checklist

Please check our git workflow. Use the draft feature if the Pull Request is not yet ready to review.

Checks by code author

Every addressed issue is linked (use the "Closes #ISSUE" keyword below)
New code adheres to coding guidelines
No large data files have been added (files should in sum not exceed 100 KB, avoid PDFs, Word docs, etc.)
Tests are added for new functionality and a local test run was successful
Appropriate documentation for new functionality has been added (Doxygen in the code and Markdown files if necessary)
Proper attention to licenses, especially no new third-party software with conflicting license has been added

Checks by code reviewer(s)

Corresponding issue(s) is/are linked and addressed
Code is clean of development artifacts (no deactivated or commented code lines, no debugging printouts, etc.)
Appropriate unit tests have been added, CI passes and code coverage is acceptable (did not decrease)
No large data files added in the whole history of commits(files should in sum not exceed 100 KB, avoid PDFs, Word docs, etc.)

Closes #369
Closes #755

codecov · 2023-08-26T12:21:29Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (5b808ce) 95.25% compared to head (d3eb492) 95.28%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #752      +/-   ##
==========================================
+ Coverage   95.25%   95.28%   +0.02%     
==========================================
  Files         113      113              
  Lines        9102     9074      -28     
==========================================
- Hits         8670     8646      -24     
+ Misses        432      428       -4

Files	Coverage Δ
cpp/models/abm/location_type.h	`100.00% <100.00%> (ø)`
cpp/models/abm/testing_strategy.cpp	`100.00% <100.00%> (+3.57%)`	⬆️
cpp/models/abm/testing_strategy.h	`100.00% <100.00%> (ø)`

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

…dual-locations-not-only-location-types

xsaschako

looks good, a few quesions and comments remain

cpp/models/abm/location_type.h

cpp/models/abm/testing_strategy.h

cpp/models/abm/testing_strategy.cpp

…dual-locations-not-only-location-types

xsaschako

looks good! Thank you

Add template for TestingCriteria to be apply for LocationType/Location

e932e12

khoanguyen-dev linked an issue Aug 24, 2023 that may be closed by this pull request

Allowing tests to be performed at individual locations, not only location types #369

Closed

khoanguyen-dev changed the title ~~Add template for TestingCriteria to be apply for LocationType/Location~~ 369-allowing-tests-to-be-performed-at-individual-locations-not-only-location-types Aug 24, 2023

khoanguyen-dev changed the title ~~369-allowing-tests-to-be-performed-at-individual-locations-not-only-location-types~~ 369 allowing tests to be performed at individual locations, not only location types Aug 24, 2023

khoanguyen-dev changed the title ~~369 allowing tests to be performed at individual locations, not only location types~~ 369 allowing tests to be performed at individual locations not only location types Aug 24, 2023

Fix error with python binding

d083904

khoanguyen-dev added 18 commits September 7, 2023 12:22

Change types of ages, infection states in TestingCriteria to bitset

9f4da51

Only one TestingCriteria per TestingScheme

823ab08

Fix error in pycode for TestingScheme

65028d0

Fix error in pycode for TestingScheme

04fb3ed

Fix error in pycode for TestingCriteria

7ac2758

Merge branch 'main' into 369-allowing-tests-to-be-performed-at-indivi…

f33e4e8

…dual-locations-not-only-location-types

Revert TestingCriteria to accept vectors of AgeGroup and InfectionState

050e9e4

Only one TestingCriteria per TestingScheme

83ef677

Add map of Location-TestingScheme to TestingStrategy

515a368

Fix errors in pycode

120232e

Use unordered_map in TestingStrategy and avoid copy in run_strategy

898dee9

Merge branch 'main' into 369-allowing-tests-to-be-performed-at-indivi…

f7c7c84

…dual-locations-not-only-location-types

Merge branch 'main' into 369-allowing-tests-to-be-performed-at-indivi…

eeb52ea

…dual-locations-not-only-location-types

Optimise testing_strategy

6df42b3

Add test for initialising TestStrategy

668fb6b

Merge branch 'main' into 369-allowing-tests-to-be-performed-at-indivi…

81172d7

…dual-locations-not-only-location-types

Fix errors in using bitset in TestingStrategy

fd5b577

Remove analyze_result 2.h

50f626f

khoanguyen-dev requested review from xsaschako and DavidKerkmann October 30, 2023 15:09

xsaschako requested changes Nov 9, 2023

View reviewed changes

This comment was marked as duplicate.

Sign in to view

khoanguyen-dev added 3 commits November 9, 2023 16:04

Merge branch 'main' into 369-allowing-tests-to-be-performed-at-indivi…

692e1b5

…dual-locations-not-only-location-types

Small fixes according to Sascha's comments

2d935f8

Remove a comment in initialisation of TestingCriteria

d3eb492

khoanguyen-dev requested a review from dabele November 10, 2023 09:22

xsaschako approved these changes Nov 10, 2023

View reviewed changes

xsaschako merged commit e24b555 into main Nov 10, 2023
55 checks passed

xsaschako deleted the 369-allowing-tests-to-be-performed-at-individual-locations-not-only-location-types branch November 10, 2023 13:25

khoanguyen-dev linked an issue Nov 10, 2023 that may be closed by this pull request

Test container for TestingCriteria #357

Closed

dabele mentioned this pull request Nov 11, 2023

Further optimization of TestingStrategy #829

Closed

2 tasks

DavidKerkmann mentioned this pull request Nov 24, 2023

829 optimize testingstrategy #830

Merged

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

369 allowing tests to be performed at individual locations not only location types #752

369 allowing tests to be performed at individual locations not only location types #752

khoanguyen-dev commented Aug 24, 2023 •

edited

Loading

codecov bot commented Aug 26, 2023 •

edited

Loading

xsaschako left a comment

This comment was marked as duplicate.

This comment was marked as duplicate.

xsaschako left a comment

369 allowing tests to be performed at individual locations not only location types #752

369 allowing tests to be performed at individual locations not only location types #752

Conversation

khoanguyen-dev commented Aug 24, 2023 • edited Loading

Changes and Information

Merge Request - Guideline Checklist

Checks by code author

Checks by code reviewer(s)

codecov bot commented Aug 26, 2023 • edited Loading

Codecov Report

xsaschako left a comment

Choose a reason for hiding this comment

This comment was marked as duplicate.

This comment was marked as duplicate.

xsaschako left a comment

Choose a reason for hiding this comment

khoanguyen-dev commented Aug 24, 2023 •

edited

Loading

codecov bot commented Aug 26, 2023 •

edited

Loading